Finish up track read progress bar commit.

diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c
index 5343db3ac3fdc5c785ae48e309e800f963912322..c72269f013248dbe78528a6200979d5159d70426 100644 (file)
--- a/gpsbabel/garmin.c
+++ b/gpsbabel/garmin.c
@@ -285,7 +285,7 @@ track_read(void)
        char trk_seg_num_buf[10];
        char *trk_name = "";
 
-       ntracks = GPS_Command_Get_Track(portname, &array);
+       ntracks = GPS_Command_Get_Track(portname, &array, waypt_read_cb);
 
        if ( ntracks <= 0 )
                return;

diff --git a/gpsbabel/jeeps/gpsapp.c b/gpsbabel/jeeps/gpsapp.c
index bf8ef5a9915ecfd31748b725e9cf28cc02bd3a04..44842723222c1761766ab220faf86a3e3df16062 100644 (file)
--- a/gpsbabel/jeeps/gpsapp.c
+++ b/gpsbabel/jeeps/gpsapp.c
@@ -3430,6 +3430,7 @@ int32 GPS_A300_Get(const char *port, GPS_PTrack **trk, pcb_fn cb)
  *
  * Hopefully, this won't be needed forever.
  */
+int 
 drain_run_cmd(gpsdevh *fd)
 {
     GPS_PPacket tra;
@@ -3458,6 +3459,7 @@ drain_run_cmd(gpsdevh *fd)
            break;
        }
     }
+  return 0;
 }
 
 /* @func GPS_A301_Get ******************************************************
@@ -3477,7 +3479,6 @@ int32 GPS_A301_Get(const char *port, GPS_PTrack **trk, pcb_fn cb)
     GPS_PPacket rec;
     int32 n;
     int32 i;
-    int ntrkpts;
 
     if(gps_trk_transfer == -1)
        return GPS_UNSUPPORTED;